Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 31 Jan 2010 21:53:42 +0000 (21:53 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 31 Jan 2010 21:53:42 +0000 (21:53 +0000)

Trivial merge